From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 05:46:45 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7701e0724215b82d2f635c19d7e7f2a9863e687c;p=emacs.git

merge from trunk
---

7701e0724215b82d2f635c19d7e7f2a9863e687c